Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add reject dlc channel offer handling #199

Merged
merged 7 commits into from
Feb 21, 2024

Conversation

holzeis
Copy link
Collaborator

@holzeis holzeis commented Feb 1, 2024

This change allows the counterparty to reject a dlc channel offer and adds a handling to gracefully transition the dlc channel to a Cancelled state.

Not super critical, but IMHO it makes it a bit clearer if the dlc channel offer is stuck or rejected.

@holzeis holzeis requested a review from Tibo-lg February 1, 2024 10:35
@holzeis holzeis self-assigned this Feb 1, 2024
This change allows the counterparty to reject a dlc channel offer and adds a handling to gracefully transition the dlc channel to a `Cancelled` state.
Set offered contract state to rejected
@holzeis holzeis force-pushed the feat/add-reject-dlc-channel-offer-handling branch from f19a1c6 to 19b0e87 Compare February 15, 2024 13:57
@holzeis
Copy link
Collaborator Author

holzeis commented Feb 15, 2024

@Tibo-lg I've addressed your review remark in 19b0e87

Additionally, I noticed that in my original commit I haven't updated the offered contract state to rejected. I've fixed that here ec83983.

Please have another look.

@holzeis holzeis requested a review from Tibo-lg February 15, 2024 13:59
Copy link
Contributor

@Tibo-lg Tibo-lg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for adding the unreserve_utxo! Just a couple more things

Set offered contract to rejected on offering side
Only unreserve utxos on the offering side.
@holzeis
Copy link
Collaborator Author

holzeis commented Feb 16, 2024

@Tibo-lg Thanks for your review. I've addressed your remarks in 645b9bf and fd34a33.

Please have another look.

@holzeis holzeis requested a review from Tibo-lg February 16, 2024 13:41
Copy link
Contributor

@Tibo-lg Tibo-lg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry some more small things

@holzeis
Copy link
Collaborator Author

holzeis commented Feb 21, 2024

@Tibo-lg I've addressed your additional remarks in 6c00d11

Please have another look

@holzeis holzeis requested a review from Tibo-lg February 21, 2024 10:16
Copy link
Contributor

@Tibo-lg Tibo-lg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@Tibo-lg Tibo-lg merged commit cce8afb into master Feb 21, 2024
140 checks passed
@holzeis
Copy link
Collaborator Author

holzeis commented Feb 21, 2024

Thank you!

oh you've merged it already 😅 . I would have cleaned up the fixups, before merging.. :)

@Tibo-lg
Copy link
Contributor

Tibo-lg commented Feb 22, 2024

oh you've merged it already 😅 . I would have cleaned up the fixups, before merging.. :)

Somehow I thought github was clever enough to squash them on merge, I guess I keep expecting too much from them...

@yancyribbens
Copy link
Contributor

Somehow I thought github was clever enough to squash them on merge, I guess I keep expecting too much from them...

Can't tell if this is sarcasm but there is a way to squash and merge. just click the green drop down arrow next to "rebase and merge" and choose "squash and merge" instead.

@Tibo-lg
Copy link
Contributor

Tibo-lg commented Feb 29, 2024

Yeah squashing is not really what I want to, I'd like it to do an autosquash, but I guess that's too much to ask :)

@yancyribbens
Copy link
Contributor

yancyribbens commented Feb 29, 2024 via email

@Tibo-lg
Copy link
Contributor

Tibo-lg commented Feb 29, 2024

Auto-squashing is an option to rebase that put automatically squashes the fixup commits. See e.g. here: https://thoughtbot.com/blog/autosquashing-git-commits

@yancyribbens
Copy link
Contributor

hmm, cool. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants